From 50353d5c57d3a0d4ad1dcaf301354a2675893b61 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Tue, 15 May 2018 19:05:28 -0600 Subject: [PATCH] fix travis --- .travis.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index df07f4ad9..7110bd1e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ matrix: - QT_VERSION=59 addons: apt: + sources: *add-sources packages: - *trusty-packages - qt59base @@ -37,15 +38,9 @@ matrix: - compiler: gcc env: - USE_DOCKER=true - addons: - apt: - sources: *add-sources - compiler: clang env: - USE_DOCKER=true - addons: - apt: - sources: *add-sources before_install: - if [ "${USE_DOCKER}" = "false" ]; then source "/opt/qt${QT_VERSION}/bin/qt${QT_VERSION}-env.sh"; fi @@ -53,10 +48,10 @@ before_install: install: - if [ "${USE_DOCKER}" = "false" ]; then wget 'https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage'; fi - if [ "${USE_DOCKER}" = "false" ]; then chmod +x linuxdeployqt-continuous-x86_64.AppImage; fi - - if [ "${USE_DOCKER}" = "false" ]; mv linuxdeployqt-continuous-x86_64.AppImage linuxdeployqt; fi + - if [ "${USE_DOCKER}" = "false" ]; then mv linuxdeployqt-continuous-x86_64.AppImage linuxdeployqt; fi script: - - if [ "${USE_DOCKER}" = "true" ] ; then ./docker_hook; fi - - if [ "${USE_DOCKER}" = "false" ] ; then ./build_and_test; fi - - if [ "${USE_DOCKER}" = "false" ] ; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file - - if [ "${USE_DOCKER}" = "false" ] ; then cd gui; QMAKE=/opt/qt${QT_VERSION}/bin/qmake LINUXDEPLOYQT=../linuxdeployqt ./makeappimage.sh; fi + - if [ "${USE_DOCKER}" = "true" ]; then ./docker_hook; fi + - if [ "${USE_DOCKER}" = "false" ]; then ./build_and_test; fi + - if [ "${USE_DOCKER}" = "false" ]; then export VERSION=$(git rev-parse --short HEAD); fi # linuxdeployqt uses this for naming the file + - if [ "${USE_DOCKER}" = "false" ]; then cd gui; QMAKE=/opt/qt${QT_VERSION}/bin/qmake LINUXDEPLOYQT=../linuxdeployqt ./makeappimage.sh; fi -- 2.30.2